Auto merge of #2496 - alexcrichton:fix-concurrent, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 18 Mar 2016 18:07:20 +0000 (11:07 -0700)
committerbors <bors@rust-lang.org>
Fri, 18 Mar 2016 18:07:20 +0000 (11:07 -0700)
commit018dc9568305a664bf65460a10a64161c998293b
treefbf0c5f04ef4428c6b08cbfd6df7603d5cb252a5
parentfe24df275e127f64d8ae042e9ea94d3fbd7148ec
parent2b9bbba5d787f5f7c32063acc285f9aae8032ffc
Auto merge of #2496 - alexcrichton:fix-concurrent, r=alexcrichton

Relax an assertion in the concurrent tests

The output may also have information about blocking, we just want the successful
part.